Added id mapping in communicationHub. Not tested yet.