Add BaseEntity and add some mappings