Adapt to Core changes (Directives + Cookies)