Add service drafts and stubs