Made some changes to Route and Route creation