Added code to parse associations