WIP: Carry keyspaces over from generated code