move extract function from builder to extractor
add token to link