Separate key out, use proper migrations from this point