Some more work on the user mapper.