- Refactoring
 - Hightlight current entity eelations