Add util class for common functions