Add support to look up existing entity by composite key