Updates for latest droidplanner