Fix extends class compatibility