I guess all in the original module is much cleaner