Replace us module with util class for 3.2 compatibility and simplicity