CPCS-38 - updates

Signed-off-by: Harpreet Singh <harpreet.singh@clicktravel.com>