Adding proper dirty and notify calls to devices