We haven't updated to match changes done upstream in a while. Updating to reflect changes for expanding support / proper types.