Added utility classes