Adding Drone and Charge Support + Some Filtering