Add back support for all devices#1