Added some more helper classes.