Final refinement on device directive