Saqib's upgrade and options to output specific formats