Binary is different now
Only set these values if they exist