Tweak category support