Added token extraction to Strategy