Add utility classes