Restoring @IdColumn and deprecating it.