move recovery props to common