Added back in systemtime support