Loading and parsing improvements