Adjusted Type Declarations to the new spec.