Added output manipulation classes