Update with some support classes