Move back towards universal algebra metaphor