Updated mappings, Added User to the Model.