Refactors to allow for installer module to run