Modifying to allow module usage