Started moving utilities to separate utility module