Replace Filter with guava Predicate
Added missing package information