Added and fixed update methods