added missing classes to fix #40