Modify class Entity and RandomGrid