Some extra code to modules