[WIP] Add group policy support