Cleaned up entity hierarchy. Simple implementations for most entity
types.