Changed some entities and Area route