Improvements to org loading