Repackage for consistency
Added basic plugin load events