adapted to latest bnd-platform snapshot