Integration of Database changes

Beginning integration of database schema changes