Apply Eugene's data structure changes