New v
Updated to be compatible with new Static-CMS changes