Added support for package versions
Clean-up of map.jinja for server/agent/frontend