Added common output stream handler and remove custom output stream handler