Improved code loading