Moved token generation to concern