Features/zfs wip differ