Small updates
Adding missing classes