Add PolicyBucketId validation