getting rid of CommonData class use