Addded policy support