Some fixes
Add special models