added persistency for devices