Fixed to use SingleObjectProxy as condition dictionary