Adjusted associations to use pointers