SVP 1.0.0 complete refactory