ENH: added more modules