APOLLO-2413 Updated mappings