- Add Validation
- Add the 'now' parameters
- Refactoring to use Enum for flag