Adding recompose-query (to be renamed)