basic improvement in maps management for servers