Module + publish/subscribe added