Added filter support + test
Added attribute support