Improve module accessiblity