Make the associations hackable + nits