Attributes sorted
TypeBuilder refactured