Changes Done after refactoring and Added Effect API's