More updates to Categories