This should do following: 1. Replace source_dict with individual source property inputs in source type classes. 2. Replace deflector_dict with individual deflector property inputs in deflector type classes.
This should do following: