Added category handling