Made plugins work properly