Fix inheritence model