Object mapping now works