Add consecutive and throwing calls support