Re-added bs2 wrappers for reference