Migrated to BC6.0.11 api

As asked in #654