adding size class support