Security refactor - schema filtering.

Security refactor - schema filtering.