fixed various concurrency issues caused by lazy initialization and this
very strange setup-routine by injecting classes instead of fully
initialize objects