Change Common to Data

All Common are converted to Data