upgraded to support changes following initializer buildout