Updates to ensure we are not calling execute methods asynchronously from within other execute methods.