Updated to use more recent Amara and added the database code