Moved types that corresponds to UriTemplate to lay below UriTemplate