Added some stuff, plugin is not guaranteed to work at this stage