Move increment to get_class