Add pins/users associations with fixes