One more changes. Now I am going to start developing of few test cases.