Updated package names
Replaced ObservableSet with SelectionModel