Added new categories and subjects