Refactored FormLoaderRepository.