That's a planned next step. This PR is limited only to splitting the UAVOs.