Added flexible output