Entity selection/deselection functionality added