Add ability to specify additional conditions for policy