Further refactors IntegrationLayerImpl (restricts the kind of events that are being handled)