BAI: integration with legacy

Signed-off-by: Mateusz Susik <mateuszsusik@gmail.com>