Back to separated entries for update and upgrade