Added creation and completion override for session