Add trace
Implement flow control for remaining cases