Filling in some missing classes