Put class back in for stderr, add one for stdout