Token extensions 1

Updated pull request.