Added support for working with primitive cell instead of unit cell