Finalize new multiple route/error handling features