Some associations added (needs fixing anyway)