DSS Enhancements V1.2

https://docs.google.com/document/d/14NIpAf5XQ62a4H5DT62-co-37wK-vxT68RezgVneRHY/edit?usp=sharing