Added class and goig to extend