Adding changes to support associations.
More assoc changes.