(TK-10) Add context-listeners to map

Add context-listeners to endpoint map when context-listeners
are provided.