Refactored to support optional date param