refactor adding args and service
don't create empty docs in new bundles

I'll find another way to enforce creation of docs later on...