Added support to Indexed parameters