Refactored time module to use option.