Added end handler and caller entity retrieval