Add bb10 support