Added join table and Inheritance