Added categories, some custom fields