Added more entities

Refreshing my memory of the persistence layer