Adding new changes for Functional testing.