Version 1.1.0: Made it more plugin-friendly