add kw Apply Username Token
set options the preferred way
refactoring timestamp

should not assume constructor is idempotent