Adding some missing classes