Tweak the database mapping ...