MethodMaker slightly changed