Added Category handling