The token system is ok like now, there is no reason to change it :)