Minor works on Models