Updated samples to work with internal update