Better implementation of the associations