Security refactor - schema filtering.