Added more subclass code