Add model & some namge changes
Removed due to class name changes