Cleanup #459
Update ERD