Make time support optional