Improve hydrate model by repository