Updated routes; Fixed constants