New attribute/entity classes and updated the new implementation

Implemented new attribute/entity classes and updated and reflected these
in the new implementation.