Added controller to URI class definition.
Updated Parser