Adding Endpoints token checking.