Add partial LoaderAPI implementation
resolve conflict