Updated utility classes