include EntityId and ExtraProperties in ConnectionOptions entity