Update utility classes