Added all SM user features (untouched)