Further improved the types.