Using explicit catalog to handle expressions and container for resolution.