Utils library has been refactored away - small changes to support this.