Update URI parser interface and updated parser to support more cases