Added Buffer and Device Change during Runtime