Refactored the stream field configuration amnd the filter fields