Add PropertyChangeSupport. Maybe?