Added support for Event Scanning with connected DB