Fixing default service map to v2