Complete Models Overhaul