Feature/spv redesign