Continue work on Spark service
Move device list to root scope
Simplify