Fix hydrator in model repository