Yet another ERD Change. Hopefully for the better