Added object => Object mapping