MSP: Convert LockedSet to a Set decorator
MSP: Switch to KDSet as default