Implement more features for BB10