Make this module independed