Handle updates. Close #4