Class entity redisigned.