Fixed entity table mapping.