enhance some module