added more scenarios
added more output fields