updated token reflection usage (could remove serialization handlers)