Decouple wrapper handler from window manager - WIP v2