Added AWS stuff and updated database format