[Bug 2021927] Updates and enhancements needed