Some more code changes.
Code changes in Test code are yet to be done.