Added support for variable type in params and handlers