Add support for empty: modules