added generic fabric support to SO