Improve module definitions