Added back support for older devices