Refactoring prod debugging to use single doc type