class refactoring, enitiy class has beed added