Add class structure