@wedaly are we taking care of both the modulestore and the contentstore?