Updated association behavior and specs