Added basic categories and sorting