Simplify support and output