Move helpers
Extract query methods