Added more filters to classtools