Adding output organization