Updated classExtend