removed polymorph-ism to even cleaner models
Updated Models