Added some missing types