Altered the structure of machine images to emphasize static factory constructors.