Made proper associations