Advanced Zone Simulation in EnergyPlus: Incorporation of Variable Properties and Phase Change Material (PCM) Capability