Add first version querying the final system