Better handling of non-module use cases