Add basic association support