Restructuring, DetailedVersion now with PropertyChangeListener support