Added prop for replaceM, fixed slight bug with generators