Adding missing classes