Switch back to inheritance model for Entity