Be more plugin friendly