Add Endpoint assertion mechanism