Feature/module optimize