Added constant and type declarations