Fix Overrides support data materials now
Overrides support data material now.
Code Cleanup