Added some group and category auto-creation