Fixing plugin API