Change token param to not required