add optional storage policy support