Adding Doortone model, associated changes