Fixing DateTime usage and adding configurable handler size