Scaffold and models added