Changes reuqired for new util-x