Refactored zero module