Modifications to capture the current system time