modified utility and regenerated classes