First draft IMF changes

DOC-60