Added category support.