Still can't get the mapping correct for 'has_one' elements