Improve motors handler