Move more stuff to marklogic