[ELY-112] entry points consolidation