Added motor wrappers