Add new migration and fix tz issue