This was done just for compiling purposes, it is not meant to be a final solution. In reality we want to refactor more of the async listener code between MDC and MC