Include missing classes