Additional device related changes