Updating some structure to make room for the future