Major changes to facilitate end to end workflow view