changes for taking care of new uri scheme