Added document mapper and did some small changes and updates in other models