Removed explicit use of SData mixins.