Updated util for using newly generated code