Add rectangular lattice support
Add rectangular lattice support