Updated routes and account specs