Implement less and queries