Move the klass method to the table and filter generator, thanks @vjt