Added option to keep method body