Added auto-creation of categories