Added extends support