Do we still need this? I expect that SM Client should handle that new