Add initial stub of structure changes