Refactor on updates