Added new functionality to the GenericController