Improve on aop module