Updated parse control flow