BB10 support improved