Redifine server class, Add new models #6