Implemented Token management