[!!!][TASK] Doctrine: Simplify restriction handling