Added additional utility classes