Added methods for use by the loader