branch to add missing plugins support