Added some of scaffolds
Merge conflict fix