Entitlment work

@jedy7070 please test again