Changes structure to use handle records rather than just handles