Refactoring Traits
Update SelectQuery for the new traits