Added all needed associations