Policy storage

PR for comment only.