Added composite type declarations