Added decoupled endpoint feature