should put migration in seperate commit @sshihata