Updates with references and estimate strategy