Finish adding blocking / sync mode