Refactoring, removed some traits