Updated motor to include entities