Rework entity, add missing delete cascade