Support additional types.