Reworked File Loading