Made additions for association