First tentative of porting VSS changes to the new codebase