Updated servicemanager and added idmap