Updated to support matrix parameters inside uri's