Changes because of some changes & refactoring of the whole plugin