Added models + general additions