Update wrappers changes
Merge pull request #747 from swatisingh10/BS_Updates

Update wrappers changes