Added two utility classes