Updated to support bb10