Aliases added, server.js adopted accordingly