Added support for memory and file based block devices