Added module categorization