Updated model using associations