update service entry poit and moved CustomRouteMatcher