Added better category support