Update types to be more compatible