No Appartment model and DH model added