Integrate SQLListener #483