Modified DB Context and Data Layering

Modified DB Context and Data Layering