Make Entity class more clean  for testing needs