Added BB10 compatibility