Add the old version (with structs)