Move token path appending to constructor