Fixed missing type declarations