- Added sparse switch support