Update for use with fixed initializers