Using assoc where needed