Database Schema update after discussing with Bill

Database Schema update after discussing with Bill