Command wrapping & build in module events