Feature/optimize modules manager