Added Authentication and combination of 2 scaffolds