Added battery and servo models