Added associations and other updates