re #33 - Added some missing classes