move more props to common