Added class structure