Refactored ItemVD and BlockVD infrastructure