Added map support to server