Added DV structure
Used case switch