[BETA] Cleaning and improving the advertising plugin