Adding obligations scaffolding