Not using expandMapping any more - it was too slow.