Make it work with the utils restructure