Improved sub-module exclusion