added missing methods and classes