Add a few more useful classes