refactoring, improved DroneContextImpl