Improved Modelling of HVAC System/Envelope Interactions in Residential Buildings