Plugin scaffolding committed