Add remaining associations