Enhancements for Rtosc Properties
Update to work with new metadata