add missing options and missing files for SHVC