Remove Converter and add filters