OpenPDroid additions