Changed inheritance to use separate tables per concrete class