Re-factoring (not final)
Support for status report added