Unified interface for the module, minor tweaks for app