Fix migration; Schema update