Better class binding