schema changes at right place, and upgrade handler