Added conditional block to include (or not) the HV.layout only when defined.