CMD modules compile better support  #20