Some modifications added to plugin