Add extended time token and fix user class

Preludes for #6