Added better infrastructure for handling robots