CQL WIP. Refactoring