Fix ClassName compatibility, and add custom plugins