Updated class structure and skeleton code