Better class structure