Redesigned and added models for additional features