Adding single/double motor support