Added a detailed output option