Drop onAreaSelection
Add state notification handlers