Added constants to module, added module instance holder