Add partial support for "lookup or create"