Migrate to new utility classes