Create new field for recovery (PART 1) and some more fixes