Added type declarations