Expanded clients and categories functionality.