Adds first partial support for FromUri complex parameters