FIX: Fixex problem with configuration builder factory which is no longer a singleton. We use instances container instead.