Added support to endpoints in a region