Added library stranded-ness support