Ability to define ignored attributes + small refactoring