Added logic to save adoption info