Adding more options for devices