Removed Attributes class. It is not needed anymore.