Refactored positions, added some operations to query