Major changes to database Diagram