Fix Load error and factory creation