Added some missing classes and functions.