Moved code from loader file to bootstrap classes