Added wrapper around modules for increased standardization.