Added support for filtering enumertions