Adjust name of method to functionality
Some generalisations, and treatment of MVA in categories