concerns refactoring - tokenable