INTEG-123 | Activity type improvement - Add PropertyChangeSupport