Activity type as a separate object
Update with more classes and lookups