Implement filters
End refactoring
Update samples