Slightly changed model classes inheritance, added Id class