Updated Server.js for compatibility with the new mapper!