[Closed #1] Implemented multi-category support