getting rid of CommonData old class dependency