Modify to manage Extends