Updates to machine structures