Refactored AbstractConnector and ParameterFilter