Added options for naming and method filtering