Added basic categories functionality