Move context back into properties.