Finalize proof of concept for zero-rpc mapped elements