Add hanging place and break events
Refactor alias map