Feature/add policy specification