Treatment for empty modules and added exclude option