More updates related to the new built-in Category node