Added scrutinizer config
More trait refactoring