Moved existence checks to integration layer
Call promise creation was moved to integration layer
Cleanup