Add multi-token options and enable expand urls