Added standalone device sources