Start adding database context