Change controllerModel values to objects with 'type' and 'arg' properties