added base entities and utility classes
no attributes, raw classes