Added Motor class