Add mapping related functions to the fb client model
Make use of the fb model methods for mapping users
And clean up the helper