Add cut RFBucket type matching. Needs some uniformation still.