Added more output filters