Add a bit more flexibility in loading load - mostly for better 3rd party support