References & Complete Cat Structure Update