Some refactor to make it easy to extend Create and Update activities.