Subsequent changes due to server.js refactoring.