Added level filtering