Add 3.1 support and extension type.