Improve modules examples