Feature/module compatibility