Changes for making local loading possible from multiple small files