Added more functionality on the plugins