Added GenericTimer and Time