Add token methods to include scope