Added some type declarations