Move Filter class into Configuration