Refactoring. Move token changes update to more appropriate place.