Added event handler & containers logic