Updates to OI and Robot Map