Moving some data types to parent class.