Refactored the zeroless module.