Add association type
Add fields name in association mapping