Added client side association pre-population