Make features use Token object instead of multiple arrays