Completed database schema and refreshed edmx