Switch to real table class
Add filtering