Addded shared sapi support