Added urls, fixed associations