Improved functions for use with load