Replace duplicated code with super call
Allow development-only plugins