Updated Active Record model associations