Chronos orchestration
Code review feedback