refactored loading operations to allow whitelisting