Removed Enums, implemented Attributes Class