add callingQueue and error management