Added support for keeping block device + early binds