Refactored completeness manager