minor changes to support nimbual container