Made the bootstrap loader more compliant with different forms of application