Fixed basic type declarations and added enums.