Updated some type declarations