Added second device set and get