Fix build Token functionality