Minor changes made for workshop as we are sharing one account