Add join to user schema and add datamapping in config