Added mapping between the various objects.