Updated URI and Time parsers