Add server and map aliases