Removed code duplication in PolicyClient