More modernizing of VC 201x for extensibility