Added needed properties from association tables