Fix models

Fix Inheritance and Ids