Added basic filter to use later for role checking