added extra minor type declarations