Modified installer structure to be more reusable