Added support for older devices