updated utilities to use modules