Added category support