WIP: Generic domain object types