Refactor AchillesPropertyHelper. Achilles CQL WIP