Added missing extends