A little more work on client mapping tables.