Modules: use public API