Switched to using lighter-common modules