Updated to remove seperate db migration