Added attribute class
Added filter, tests
More tests