Rework Policy model to be more flexible with Users