Adding support for systemtime