[task] improved adapter and device factories