Changes on plugins loading process