Added missing properties and removed inherited fields