Added support for motor records