Added support for bs data-api. Fixes #668