Add BaseEntity fields, even if they aren't being used correctly