Improve update design