Alter structure a little