Fixed config overriding
Added framing for capturing event.