Added more class structure