Continue AttributesCaster refactoring