Updating update method and fixing legacy compatibility.