Added a few additional utility classes