added entities for OES and common infra (newer version deleted useless table)