VOLDEV-56 Update legacy code