Added nodelet support