Update to new jump table format