updated with missing classes