Add Extends support