Committing changes from Jason
Fixed saving of AWS entry in database