Added categories in setup flow