Several changes, building towards automatic sensor forwarding