Database mapping changes