Made changes to the way categories and features are added