Integrate Dan P's feedback into ER diagram