Update: Make the Plugin more generic