TIMOB-15998-Added documentation, addressed review comments