SFM: Added feature sets support