Moved filters to lib