More idiomatic token and device implementation