Update with all necessary methods