Fix extends for classes