Reverted from ObservableList to List