Add  utility classes