Optimization: changes in motor API