Added more advanced associations