Initial changes to database schema